Preview: Resolved #12

Preview: Resolved #12